Hlsl path tracer #224

devshgraphicsprogramming · 2025-11-03T16:17:03Z

@keptsecret after you merge master again, you'll probably have the UI mess up and show changed from the merge commit, so close and reopen again

TODO

7 unresolved conversations from RWMC #218, check if done

devshgraphicsprogramming · 2025-12-15T06:14:51Z

31_HLSLPathTracer/app_resources/hlsl/rand_gen.hlsl

+template<typename RNG>
+struct Uniform1D
+{
+    using rng_type = RNG;
+    using return_type = uint32_t;
+
+    static Uniform1D<RNG> construct(uint32_t2 seed)
+    {
+        Uniform1D<RNG> retval;
+        retval.rng = rng_type::construct(seed);
+        return retval;
+    }
+
+    return_type operator()()
+    {
+        return rng();
+    }
+
+    rng_type rng;
+};
+
 template<typename RNG>
 struct Uniform3D
 {


would make sense to just template it on dimensions count

devshgraphicsprogramming · 2025-12-15T06:15:43Z

31_HLSLPathTracer/app_resources/hlsl/render.comp.hlsl

-    pathtracer.randGen = randgen_type::create(scramblebuf[coords].rg);     // TODO concept this create
+    pathtracer.randGen = randgen_type::construct(scramblebuf[coords].rg);     // TODO concept this create


we call our pseudo constructors create not construct

devshgraphicsprogramming · 2025-12-15T20:56:57Z

31_HLSLPathTracer/app_resources/hlsl/accumulator.hlsl

+#ifndef _NBL_HLSL_EXT_ACCUMULATOR_INCLUDED_
+#define _NBL_HLSL_EXT_ACCUMULATOR_INCLUDED_
+
+#include <nbl/builtin/hlsl/vector_utils/vector_traits.hlsl>
+
+namespace Accumulator
+{
+
+template<typename OutputTypeVec NBL_PRIMARY_REQUIRES(concepts::FloatingPointVector<OutputTypeVec>)
+struct DefaultAccumulator
+{
+    using input_sample_type = OutputTypeVec;
+    using output_storage_type = OutputTypeVec;
+    using this_t = DefaultAccumulator<OutputTypeVec>;
+    using scalar_type = typename vector_traits<OutputTypeVec>::scalar_type;
+
+    static this_t create()
+    {
+        this_t retval;
+        retval.accumulation = promote<OutputTypeVec, scalar_type>(0.0f);
+
+        return retval;
+    }
+
+    void addSample(uint32_t sampleCount, input_sample_type _sample)
+    {
+        scalar_type rcpSampleSize = 1.0 / (sampleCount);
+        accumulation += (_sample - accumulation) * rcpSampleSize;
+    }
+
+    output_storage_type accumulation;
+};
+
+}
+
+#endif


this needs to move to Nabla, somewhere in the path_tracing namespace

devshgraphicsprogramming · 2025-12-15T20:58:07Z

31_HLSLPathTracer/app_resources/hlsl/common.hlsl

+namespace nbl
+{
+namespace hlsl
+{
+namespace path_tracing
+{


no namespace for the example

devshgraphicsprogramming · 2025-12-15T20:58:52Z

31_HLSLPathTracer/app_resources/hlsl/concepts.hlsl

+#ifndef _NBL_HLSL_PATHTRACING_CONCEPTS_INCLUDED_
+#define _NBL_HLSL_PATHTRACING_CONCEPTS_INCLUDED_
+
+#include <nbl/builtin/hlsl/concepts.hlsl>
+
+namespace nbl
+{
+namespace hlsl
+{
+namespace path_tracing
+{
+namespace concepts
+{
+
+#define NBL_CONCEPT_NAME RandGenerator
+#define NBL_CONCEPT_TPLT_PRM_KINDS (typename)
+#define NBL_CONCEPT_TPLT_PRM_NAMES (T)
+#define NBL_CONCEPT_PARAM_0 (rand, T)
+NBL_CONCEPT_BEGIN(1)


this whole header needs get moved to Nabla

devshgraphicsprogramming · 2025-12-15T21:05:07Z

31_HLSLPathTracer/app_resources/hlsl/render_common.hlsl

+#else
+    nbl::hlsl::float32_t4x4 invMVP;
+    nbl::hlsl::float32_t3x4 generalPurposeLightMatrix;
+#endif


can you not just use this version for both langs ?

devshgraphicsprogramming · 2025-12-15T21:05:38Z

31_HLSLPathTracer/app_resources/hlsl/render_rwmc_common.hlsl

+#ifndef __HLSL_VERSION
+#include "matrix4SIMD.h"
+#endif


whats this for ?

devshgraphicsprogramming · 2025-12-15T21:06:01Z

31_HLSLPathTracer/app_resources/hlsl/render_rwmc_common.hlsl

+#ifndef _NBL_HLSL_PATHTRACER_RENDER_RWMC_COMMON_INCLUDED_
+#define _NBL_HLSL_PATHTRACER_RENDER_RWMC_COMMON_INCLUDED_


wrong header guard, this is example's source

devshgraphicsprogramming · 2025-12-15T21:06:09Z

31_HLSLPathTracer/app_resources/hlsl/render_common.hlsl

+#ifndef _NBL_HLSL_PATHTRACER_RENDER_COMMON_INCLUDED_
+#define _NBL_HLSL_PATHTRACER_RENDER_COMMON_INCLUDED_


wrong header guard, this is example's source

devshgraphicsprogramming · 2025-12-15T21:06:43Z

31_HLSLPathTracer/app_resources/hlsl/rwmc_global_settings_common.hlsl

+#ifndef _NBL_HLSL_PATHTRACER_RWMC_GLOBAL_SETTINGS_COMMON_INCLUDED_
+#define _NBL_HLSL_PATHTRACER_RWMC_GLOBAL_SETTINGS_COMMON_INCLUDED_
+#include "nbl/builtin/hlsl/cpp_compat.hlsl"
+
+NBL_CONSTEXPR uint32_t CascadeCount = 6u;
+
+#endif


kinda silly having one header just for this

kick it into the main common file

devshgraphicsprogramming · 2025-12-15T21:08:07Z

31_HLSLPathTracer/app_resources/hlsl/scene.hlsl

+    Shape<scalar_type, PST_SPHERE> light_spheres[1];
+    Shape<scalar_type, PST_TRIANGLE> light_triangles[1];
+    Shape<scalar_type, PST_RECTANGLE> light_rectangles[1];


you shouldn't need unused members if you have getters

devshgraphicsprogramming · 2025-12-15T21:08:55Z

31_HLSLPathTracer/include/nbl/this_example/transform.hpp

+		if (ImGui::IsKeyPressed(ImGuiKey_S) && params.allowedOp & ImGuizmo::OPERATION::SCALE) // for triangle/rectangle
+			mCurrentGizmoOperation = ImGuizmo::SCALE_X | ImGuizmo::SCALE_Y;
+
+#if 0


whats this if 0 about?

devshgraphicsprogramming · 2025-12-15T21:19:32Z

31_HLSLPathTracer/app_resources/hlsl/render_common.hlsl

+#ifndef __HLSL_VERSION
+#include "matrix4SIMD.h"
+#endif


remove the include, not needed

devshgraphicsprogramming · 2025-12-15T21:21:54Z

31_HLSLPathTracer/app_resources/hlsl/render_rwmc_common.hlsl

+struct RenderRWMCPushConstants
+{
+	RenderPushConstants renderPushConstants;
+	nbl::hlsl::rwmc::SplattingParameters splattingParameters;


the splatting params shoul have never been compressed in Nabla, they should have been compressed here, and a getter/setter method here too

devshgraphicsprogramming · 2025-12-15T21:22:46Z

31_HLSLPathTracer/app_resources/hlsl/resolve.comp.hlsl

+#ifdef PERSISTENT_WORKGROUPS
+#include "nbl/builtin/hlsl/math/morton.hlsl"
+#endif


devshgraphicsprogramming · 2025-12-15T21:23:26Z

31_HLSLPathTracer/app_resources/hlsl/resolve.comp.hlsl

+
+    float32_t3 color = resolve(accessor, int16_t2(coords.x, coords.y));
+
+    //float32_t3 color = rwmc::reweight<rwmc::ResolveAccessorAdaptor<float> >(pc.resolveParameters, cascade, coords);


remove commented code

devshgraphicsprogramming · 2025-12-15T21:23:49Z

31_HLSLPathTracer/app_resources/hlsl/resolve_common.hlsl

+#ifndef _NBL_HLSL_PATHTRACER_RESOLVE_COMMON_INCLUDED_
+#define _NBL_HLSL_PATHTRACER_RESOLVE_COMMON_INCLUDED_


wrong header guard, this is userspace code

devshgraphicsprogramming · 2025-12-15T21:24:25Z

31_HLSLPathTracer/app_resources/hlsl/resolve_common.hlsl

+
+struct ResolvePushConstants
+{
+	uint32_t sampleCount;


unused variable

devshgraphicsprogramming · 2025-12-15T21:28:21Z

31_HLSLPathTracer/main.cpp

+		RenderRWMCPushConstants rwmcPushConstants;
+		RenderPushConstants pc;
+		ResolvePushConstants resolvePushConstants;


don't you rebuild them every frame from imgui stuff + camera etc?

Maybe lets not store them around as global state and have them transient

devshgraphicsprogramming · 2025-12-15T21:29:54Z

31_HLSLPathTracer/main.cpp

+		std::array<smart_refctd_ptr<IGPUComputePipeline>, E_LIGHT_GEOMETRY::ELG_COUNT> m_PTGLSLPipelines;
+		std::array<smart_refctd_ptr<IGPUComputePipeline>, E_LIGHT_GEOMETRY::ELG_COUNT> m_PTHLSLPipelines;
+		std::array<smart_refctd_ptr<IGPUComputePipeline>, E_LIGHT_GEOMETRY::ELG_COUNT> m_PTGLSLPersistentWGPipelines;
+		std::array<smart_refctd_ptr<IGPUComputePipeline>, E_LIGHT_GEOMETRY::ELG_COUNT> m_PTHLSLPersistentWGPipelines;
+		std::array<smart_refctd_ptr<IGPUComputePipeline>, E_LIGHT_GEOMETRY::ELG_COUNT> m_PTHLSLPipelinesRWMC;
+		std::array<smart_refctd_ptr<IGPUComputePipeline>, E_LIGHT_GEOMETRY::ELG_COUNT> m_PTHLSLPersistentWGPipelinesRWMC;


you can delete GLSL code now

devshgraphicsprogramming · 2025-12-15T21:30:34Z

31_HLSLPathTracer/main.cpp

+		void updatePathtracerPushConstants()
+		{
+			// disregard surface/swapchain transformation for now
+			const auto viewProjectionMatrix = m_camera.getConcatenatedMatrix();
+			// TODO: rewrite the `Camera` class so it uses hlsl::float32_t4x4 instead of core::matrix4SIMD
+			core::matrix4SIMD invMVP;
+			viewProjectionMatrix.getInverseTransform(invMVP);
+			if (useRWMC)
+			{
+				memcpy(&rwmcPushConstants.renderPushConstants.invMVP, invMVP.pointer(), sizeof(rwmcPushConstants.renderPushConstants.invMVP));
+				rwmcPushConstants.renderPushConstants.generalPurposeLightMatrix = hlsl::float32_t3x4(transpose(m_lightModelMatrix));
+				rwmcPushConstants.renderPushConstants.depth = depth;
+				rwmcPushConstants.renderPushConstants.sampleCount = resolvePushConstants.sampleCount = spp;
+				rwmcPushConstants.renderPushConstants.pSampleSequence = m_sequenceBuffer->getDeviceAddress();
+				//rwmcPushConstants.splattingParameters.log2Start = std::log2(rwmcStart);
+				//rwmcPushConstants.splattingParameters.log2Base = std::log2(rwmcBase);
+				float32_t2 packLogs = float32_t2(std::log2(rwmcStart), std::log2(rwmcBase));
+				rwmcPushConstants.splattingParameters.packedLog2 = hlsl::packHalf2x16(packLogs);
+			}
+			else
+			{
+				memcpy(&pc.invMVP, invMVP.pointer(), sizeof(pc.invMVP));
+				pc.generalPurposeLightMatrix = hlsl::float32_t3x4(transpose(m_lightModelMatrix));
+				pc.sampleCount = spp;
+				pc.depth = depth;
+				pc.pSampleSequence = m_sequenceBuffer->getDeviceAddress();
+			}
+		}


you can move into a lambda somwhere in workLoopBody

devshgraphicsprogramming · 2025-12-15T21:31:04Z

31_HLSLPathTracer/main.cpp

+		float rwmcMinReliableLuma;
+		float rwmcKappa;
+		float rwmcStart;
+		float rwmcBase;


gather them up, make nicer create methods for splatting and resolve params

see #218 (comment)

keptsecret added 30 commits February 3, 2025 14:52

copied ex 30 to new ex 31

eab0f70

ignore events on imgui focus

8521123

initial files for pathtracer

b171724

intersection logic

af35393

changes to intersection logic

5a5fbfe

completed material system?

85e67ad

sphere nee stuff

2c500b1

triangle sampling

e6a9916

rectangle sampling

6dc25eb

nee stuff

22bd6f9

scene representation, getmeasure for pt

3bb858b

moved scene rep out, some closest hit stuff

f5adbf6

sample light part of closest hit

159d153

fix bugs, reorganize traceRay

a7350db

sample bsdf in closest hit

8a4e0a9

set up path tracer render shader

72104b8

finish render shader

202c645

hlsl path tracer initial, bug fixes

2f77555

fix shader bugs

99aed47

Merge branch 'master' into hlsl_path_tracer

a1a8ec0

bug fixes #3

a802a97

fix include when embed resources off

eed47e7

fixed more bugs #4

6e26dae

Merge branch 'master' into hlsl_path_tracer

3827fd3

fix compile hlsl shader bug

da661c0

more bug fixes #5

f97757b

more bug fixes #6

8e759f2

Merge branch 'master' into hlsl_path_tracer

2dfadfe

refactor to use new frisvad

b1831d9

fix bugs again

cb5662a

keptsecret added 2 commits December 11, 2025 11:15

fix sphere declarations

456f9e2

Merge branch 'master' into hlsl_path_tracer

6f9bdc3

devshgraphicsprogramming commented Dec 15, 2025

View reviewed changes

keptsecret added 3 commits December 15, 2025 15:55

fix quantized sequence usage, generating samples for sequence

feed271

clamp result of decode quantized sequence

12a17d0

revert previous commit because it's not above 1.0 anymore

ea3ec9e

devshgraphicsprogramming commented Dec 15, 2025

View reviewed changes

devshgraphicsprogramming mentioned this pull request Dec 15, 2025

RWMC #218

Merged

keptsecret added 2 commits December 16, 2025 10:58

Merge branch 'master' into hlsl_path_tracer

cb14ea4

refactor partitionRandVar changes

6956bf1

		pathtracer.randGen = randgen_type::create(scramblebuf[coords].rg); // TODO concept this create
		pathtracer.randGen = randgen_type::construct(scramblebuf[coords].rg); // TODO concept this create

		#ifndef _NBL_HLSL_PATHTRACER_RENDER_RWMC_COMMON_INCLUDED_
		#define _NBL_HLSL_PATHTRACER_RENDER_RWMC_COMMON_INCLUDED_

		#ifndef _NBL_HLSL_PATHTRACER_RENDER_COMMON_INCLUDED_
		#define _NBL_HLSL_PATHTRACER_RENDER_COMMON_INCLUDED_


		float32_t3 color = resolve(accessor, int16_t2(coords.x, coords.y));

		//float32_t3 color = rwmc::reweight<rwmc::ResolveAccessorAdaptor<float> >(pc.resolveParameters, cascade, coords);

		#ifndef _NBL_HLSL_PATHTRACER_RESOLVE_COMMON_INCLUDED_
		#define _NBL_HLSL_PATHTRACER_RESOLVE_COMMON_INCLUDED_

Hlsl path tracer #224

Are you sure you want to change the base?

Hlsl path tracer #224

Conversation

devshgraphicsprogramming commented Nov 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

TODO

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

devshgraphicsprogramming Dec 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

devshgraphicsprogramming Dec 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

devshgraphicsprogramming commented Nov 3, 2025 •

edited

Loading

devshgraphicsprogramming Dec 15, 2025 •

edited

Loading

devshgraphicsprogramming Dec 15, 2025 •

edited

Loading